From: Colin Walters <walters@verbum.org>
Date: Fri, 5 Aug 2016 01:31:39 +0000 (-0400)
Subject: lib: Drop GFiles for self->{objects_dir,state_dir}
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~49^2~17
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=18a576c3907d5f42c7cee79600731be3ef32b808;p=ostree.git

lib: Drop GFiles for self->{objects_dir,state_dir}

Everything that used to reference these is now fd-relative.

Closes: #432
Approved by: giuseppe
---

diff --git a/src/libostree/ostree-repo-private.h b/src/libostree/ostree-repo-private.h
index 917a9dae..e20e7455 100644
--- a/src/libostree/ostree-repo-private.h
+++ b/src/libostree/ostree-repo-private.h
@@ -73,8 +73,6 @@ struct OstreeRepo {
   int    tmp_dir_fd;
   int    cache_dir_fd;
   char  *cache_dir;
-  GFile *objects_dir;
-  GFile *state_dir;
   int objects_dir_fd;
   GFile *deltas_dir;
   GFile *uncompressed_objects_dir;
diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index 675e1cac..e9966b5f 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -520,11 +520,9 @@ ostree_repo_finalize (GObject *object)
     (void) close (self->tmp_dir_fd);
   if (self->cache_dir_fd)
     (void) close (self->cache_dir_fd);
-  g_clear_object (&self->objects_dir);
   if (self->objects_dir_fd != -1)
     (void) close (self->objects_dir_fd);
   g_clear_object (&self->deltas_dir);
-  g_clear_object (&self->state_dir);
   g_clear_object (&self->uncompressed_objects_dir);
   if (self->uncompressed_objects_dir_fd != -1)
     (void) close (self->uncompressed_objects_dir_fd);
@@ -613,10 +611,8 @@ ostree_repo_constructed (GObject *object)
 
   self->tmp_dir = g_file_resolve_relative_path (self->repodir, "tmp");
 
-  self->objects_dir = g_file_get_child (self->repodir, "objects");
   self->deltas_dir = g_file_get_child (self->repodir, "deltas");
   self->uncompressed_objects_dir = g_file_get_child (self->repodir, "uncompressed-objects-cache");
-  self->state_dir = g_file_get_child (self->repodir, "state");
   self->config_file = g_file_get_child (self->repodir, "config");
 
   /* Ensure the "sysroot-path" property is set. */